test d1e1e547-1d6e-4e00-abf6-01b82b1dccd0 (rebased onto develop)


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

----

This is a call to Sandbox.open_pr by testRemote