Merge branch 'tr/maint-apply-non-git-patch-parsefix' into maint