test 12b96d8b-ba14-4330-a23c-31cc4015cefa (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testRemote