test 8fdf3921-a2f7-4622-9396-c8afa94ee70c (rebased onto develop)



This is the same as gh-7166 but rebased onto develop.

----

This is a call to Sandbox.open_pr by testRemote