Merge "sonar fix - FeatureServerPool"