Merge branch 'master' into salsubaiee/master_add_configurable_bloom_filter_parameter