QA-Changes for OC-Matterhorn 1.4