test e7a76cff-8eaf-48fb-82d3-a003d3392e9c (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testRemote