Merge branch 'dp/maint-1.6.5-fast-import-non-commit-tag' into maint