Fixes #3153 Fixes #2513 Fixes #2512 Co-Authored-By: Mark McDowall <markus101@users.noreply.github.com>