Merge branch 'ak/git-done-help-cleanup' into maint