Merge pull request #8482 from BKPepe/pyaml