Fixes #6732
Fixes #6731
Fixes #6728
Fixes #6727
Fixes #6726
Possible fix for #6729
Fixes #6725
Fixes #6724
Fixes #6705
Fixes #6704
Merge pull request #6734 from Zuhayr/master

Fixes