Merge pull request #23574 from dalfos/yggdrasil-0.5.5