Merge "Fix pagecount output"