Fix design docs and analytics component.
Merge pull request #4011 from HassenRiahi/FixDesignDocsAndAnalytics

Fix design docs and the analytics component.