[Delivers #69448908] Added changesets and other fixes