test 18252a6f-0f24-4099-a798-34c999cae06b (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testDefault