Merge branch 'tv/rebase-stat'