Merge branch 'help-cleanup' into dt-test