Merge "Docs: Categorizing issues and making minor updates"