test 28b9b0b5-8686-4f7d-918b-e5c0aa62d063 (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testRemote