Merge "Docs: Fixing issues reported by Madan."