updates waiting for merge from master to fix bitmap performance