test f26e72df-a5ef-419a-abb5-2cf24dfc93ac (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testRemote