Merge "Remove oof_directives from user_directives" into dublin