Merged updates from Architect