test 9d0f0293-ffd0-47ba-9a62-7b875bf5d615 (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testRemote