Lock and ping by IP if possible
Bump version
Merge branch 'develop'