Merge branch 'tr/merge-recursive-flush'