test 39f75e65-b9bb-4683-94a6-c98641032832 (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testDefault