Merge "Updates for overview doc"