Merge "Fix check for PROC_QUOTES mode"