Merge pull request #7496 from Zuhayr/dev-freeze

Dev freeze
Should fix #6782