Merge "Use cls in classmethod instead of self"