Merge branch 'ah/maint-grep-double-init' into maint