test e3aa8330-14cd-4e56-b96c-cae88010db53 (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testRemote