Fixes #4923
Fixes #4918
Fixes #4808
Fixes #4716
Fixes #4744
Fixes #4911
Fixes #3993
Merge pull request #4949 from Zuhayr/master

Fixes.