Merge branch 'master' into dashboard-single-line-iterate-stats-is-broken