Merge pull request #8511 from BKPepe/ruamel-yaml