test 835a5e73-6ef9-49ad-8e30-e51a0ec664ac (rebased onto develop)


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

----

This is a call to Sandbox.open_pr by testDefault