Merge Architecture into Development