test 583028af-2ca1-460b-a1d1-3cd9eceeb153 (rebased onto develop)


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

----

This is a call to Sandbox.open_pr by testRemote