Merge "General doc updates"