test 223ca71f-c61c-49ce-acef-f0dd83373d98 (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testDefault