test 0fb3d332-1fb4-4c4b-b621-93e78aa52ec5 (rebased onto develop)


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

----

This is a call to Sandbox.open_pr by testRemote