Merge "Add docstrings to the model" into feature/zuulv3