test f411507d-53e2-429f-83b5-4c6866e04ac6 (rebased onto develop)


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

----

This is a call to Sandbox.open_pr by testRemote