test d606731f-297c-4d6b-a2f0-31f7689bb909 (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testRemote