Merge fixes due to AX modifications and new M/D data (more updates coming).