test 84796dd0-4a94-4245-a69c-c77d87b42bff (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testRemote