test 9d3efd70-11ba-4e39-8e7b-66a7e275a40a (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testRemote