Incomplete commit for local IP support