merged commits ahead of local repository of asterix_lsm_stabilization