Merge "Use cls in class method instead of self"