test eb9113cb-7cda-45ac-968f-4eafb86fe312 (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testRemote