test 7db9b221-eefb-4934-a111-d9b582ff88b4 (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testRemote