Merge "Sonar fix too many method param"