Merge pull request #9703 from Filoppi/fix_expression_serialization Fix serialization of control expressions with line breaks