Merge "Fix tag explanations in usage and comments"