Merge branch 'tb/bitmap-type-filter-comment-fix'