test 4f1ea7a7-0658-4136-a0aa-74f1b9d26ba8 (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testRemote