test e3f8c964-6526-4176-8676-509c0c920ba1 (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testRemote