Fixes #6656
Fixes #6645
Fixes #6644
Merge pull request #6658 from Zuhayr/dev-freeze

Fixes