test 9832cedb-ca7b-400a-a996-928749d9648a (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testRemote