Merge "Status: Correct documentation"