Merge Xian Nox qcma branch into testing