Fix incorrect listing of records from to count
Fix merge conflict
Merge branch 'QA_4_0'