Merge branch 'jk/diff-memuse-optim-with-stat-unmatch'