test 4ff3545c-585e-416c-a378-d3353a2fe733 (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testDefault