test d5d2c97e-36eb-4bfc-a8b5-8a4cd0772ec9 (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testRemote