Merge "Make 'quotation-marks' message non-optional"