Branch Unit 6's commit on CMQIA