Use the internal IP address when public hostnames are not available.
Merge branch 'dev' into 2.4