test d3450e44-dd12-47f9-a58d-6f272be17eda (rebased onto develop)


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

----

This is a call to Sandbox.open_pr by testDefault