Merge "Update Architecture Overview" into frankfurt