test f3b7940b-b7e4-4648-81b6-1e4029409744 (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testRemote