test 5532d0b4-a708-4e4d-aa63-8b84a089415e (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testRemote