test d04ef877-28fc-4bbe-b1b9-f9f87ae0935e (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testRemote