Merge "sonar fix for server pool"