Merge "Modifications #1 for 'Istanbul' release: architecture diagram"