test 82b444b3-3782-47ce-903f-80ce682ba38d (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testRemote