Merge "Fix sonars in server-pool"