test 758739c2-fce2-463a-ad2a-02d24cf52697 (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testRemote