Merge pull request #5662 from Zuhayr/dev-freeze

Dev freeze