Merge branch '2493_file_operation_regexp_error'