Merge branch 'asterix_lsm_stabilization' into yingyi/asterix_beta_fix