test 8cf2aff0-80fa-4fdf-9a48-b326c897b1b9 (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testDefault