Merge branch 'tr/merge-recursive-flush' into maint-1.7.11