Merge "Some updates to the design docs"