test 93d337c9-0fd2-4e63-ba86-2d0a9eeb4156 (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testDefault