Add --use-private-ip and --prefer-private-ip option in update method
Merge branches 'spike' and 'private-ip-feature' into spike
Bug fix