test 18f73f65-a0a1-4e08-b26d-93127c46c900 (rebased onto develop)


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

----

This is a call to Sandbox.open_pr by testRemote