Fixes #5595
Fixes #5600
Fixes #5540
Bandaid fix for #5589
Fixes #5573
Fixes #5611
Fixes #5608
Fixes #5508
Fixes #5523
Fixes #5531
Fixes #5485
Merge pull request #5612 from Zuhayr/dev-freeze

Fixes.