test e78b0b7f-dc1b-4917-9781-7329086001c2 (rebased onto develop)


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

----

This is a call to Sandbox.open_pr by testDefault