test 5db58b45-b632-44a6-8d26-b23c79095601 (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testRemote