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