commit from asterix_lsm_stabilization