Add call to get the toplevel service element by ip address.
Merge remote-tracking branch 'origin/development' into development