test c17d6ed9-d035-43f6-aba8-5be598fcd542 (rebased onto develop)


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

----

This is a call to Sandbox.open_pr by testRemote