Merge branch 'nd/maint-fix-add-typo-detection' (early part)