Fixes #5491
Fixes #5490
Fixes #5461
Fixes #5483
Fixes #5214
Merge pull request #5493 from Zuhayr/master

Fixes