test a77c70a4-649f-4967-b1b2-4b8187b19d18 (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testRemote