Merge branch 'v5-stable-newstats' into v5-devel