Merge in CAS Refactor