Merge branches 'release' and 'stats' into release