test 175f84e9-57d5-4244-b04b-bb773d86e26f (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testDefault