Fixes #5387
Fixes #5415
Fixes #5414
Merge pull request #5416 from Zuhayr/dev

Dev-freeze fixes.