test 7eb9dcb9-4343-453b-9103-dc838b71f98e (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testDefault