Merge branch 'ar/mergestat'