test a85c1f56-9419-48a5-a0a0-258d084ebf05 (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testRemote