test fa911096-26a7-4e19-bd4a-fceb97d1d64e (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testDefault