Merge branch 'deprecate-opts' into dt-test
Merge branch 'move-create-accounts' into dt-test