Fixes #4923
Fixes #4744
Fixes #4911