test 5bf8f39f-4493-426e-8700-5fd8441e9984 (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testDefault