Merge "Finalize architecture documentation"