Merge "Remove unused parameter" into main