Merge branch 'ah/connect-parse-feature-v0-fix' into maint