merge from asterix_lsm_stabilization