test 069e4f4d-bb4c-48f9-992c-8c64d17a3d91 (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testDefault