Fixes #6198
Fixes #6178
Fixes #6174
Fixes #6137
Fixes #6119
Fixes #5879
Fixes #5874
Fixes 5866#