test 1eaad518-fc97-47aa-88f3-5be0e033f482 (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testDefault