Merge "Change into staticmethod"