Merge branch 'salsubaiee/asterix_lsm_stabilization_issue_266' into asterix_lsm_stabilization (Reviewed by Raman.)