Merge "Remove $this reference in static method"