Merge "Fix bitmap filtration tests to be more stable" into lmp-mr1-dev