Add stats definitions
Merge remote-tracking branch 'origin/topic/jh_stats-definitions' into develop