Merge "Fix inconsistent tracing of bitmap count/memory" into main