test fc56be07-9395-484e-a493-a6ab50a20603 (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testRemote