test 66625e07-e69e-4a93-878d-484567a1adb4 (rebased onto develop)


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

----

This is a call to Sandbox.open_pr by testRemote