test ccfe95a1-2e96-47b4-8385-32c721b884c5 (rebased onto develop)


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

----

This is a call to Sandbox.open_pr by testRemote