Merge "Remove redundant local parameters in Client" into main