Merge "Architecture documentation updates"