Include nofOrdered in reservable_count and total_count
Merge branch 'refactor' into merge