Fixes #5188
Fixes #5113
Fixes #5090
Fixes #5296