(topic/stats) Merged to master