Merged from Architect