test f387714c-fadf-4f90-8e22-9eda665803c9 (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testDefault