Merge "Allow servicedispatcher to use an ip address" into main