test ddd5ae75-89a8-4b9c-b584-2c00b0b8d7a1 (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testRemote