test 6cf637e8-fe5e-4360-ad15-a4db1315874a (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testDefault