Merge branch 'master' into develop
_get_host_ips: safe/unsafe modes.
filter_resolve: safe/unsafe modes.
Merge branch 'safe_resolve' into develop
Merge branch 'develop'