Merge branch 'icount-update' into HEAD