test bd816aa3-7bea-47a0-aff2-5085cc4fd819 (rebased onto develop)


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

----

This is a call to Sandbox.open_pr by testDefault