Merge "Refine documentation"