test bf33c643-c611-4206-b60c-02ccce92e4e8 (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testRemote