test 7818c56d-b326-443a-b185-468374364d86 (rebased onto develop)


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

----

This is a call to Sandbox.open_pr by testRemote