Merge branch 'master' into zheilbron/asterix_lsm_stabilization_config_changes