test c54e2b63-948e-44ce-81d0-f8247e5b6653 (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testRemote