test c574fbfd-9305-4654-9103-48b1f4905f70 (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testRemote