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