test ab9c8d26-c2a5-445c-bd03-a8ae8adf261f (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testDefault