Merge "Update documentation for clarity"