test 7cf7069c-f9b6-418d-a787-de755bbf1e22 (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testRemote