Merge "Fixed an unused param warning"