test b5106b07-4006-49f1-b9e5-c3babd43963f (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testDefault