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