Merged master into salsubaiee/master_change_lsm_merge_policy