Merge "Refine docs" into stable/colorado