Merge branch 'tb/bloom-improvements'