test 9d7d7d30-65ac-4cc1-99c2-367c94b7c1ee (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testRemote