Merge "Stop doing $that = $this in includes/changes"