test 5c72f19a-aa86-4021-929d-9c8b4dacbb00 (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testDefault