test d968ac13-c626-47e6-b150-5faef5386f05 (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testDefault