more yamly yaml
Merge pull request #12900 from KennethWilke/develop

more yamly yaml