Fixes #7833 Fixes #6785 Fixes #6787 Co-Authored-By: Mark McDowall <markus101@users.noreply.github.com>