Merge branch 'tb/bitmap-walk-with-tree-zero-filter'