EMM-718 - IP/Hostname not taken dynamically
Merge branch 'master' into develop