test 6839cbb7-8a07-4a4c-b853-863e1c892e41 (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testDefault