test c23870e7-e97d-4b40-a5fe-8514bc2c18fd (rebased onto develop)


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

----

This is a call to Sandbox.open_pr by testDefault