Merge pull request #4645 from Andi-K/3.6-rc