test dd952b23-ae41-49df-ad0e-ee27f5322cf3 (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testDefault