test b1255ee8-46c0-49c1-bf4f-4a448da89657 (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testDefault