Co-Authored-By: Mark McDowall <markus101@users.noreply.github.com> (cherry picked from commit 4ef2174226a0210f756f180dded8567d659589e2)