Move requires_record_count to class instance
#1385
Merged
requires_record_count to class instance
#1385