Merge branch 'poscount-num_expand' into tomaster