test 1736f635-a270-4274-92c5-a7e155c42d3d (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testRemote