test 6a714e82-2731-4c6a-9cf3-a8bc76a88c28 (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testRemote