Merge pull request #1701 from mzglinski/fix/format-rule-to-yaml-class-instances