Merge branch 'rebuild-password' into dt-test
Merge branch 'secgroup-commands' into dt-test