Fix multiple breaking changes appearing on a single line
Merge branch 'fix_multiple_breaking_changes' into local