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