Merge master into raman/asterix_lsm_stabilization_coredump.