Merge "Add docstrings in unit"