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