Merge "Update architecture section"