Merge "Fix linter errors in IpServer and its dependencies"