Merge "Use cls instead of self in classmethod"