Merge branch 'master' into develop
Add IP check to config
Merge branch 'ip-address-config'