test 0d012eaf-a73b-45da-a884-103f2ddd25b2 (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testRemote