test d5f859f7-4dcc-4484-bf2e-37f398d7d485 (rebased onto develop)


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

----

This is a call to Sandbox.open_pr by testDefault