merge from zheilbron/asterix_msr (checkpoint 1)