Merge "Fix total entry count reference" into main