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