Apply MMAC changes from master.