Should fix #6782
Merge pull request #7498 from Zuhayr/dev-freeze

Should fix #6782