Merge "Update architecture diagram"