Merge commit 'karsten/stats-tests'