Merge "Wrap some IpServer commands"