Comment count
Merge fix