Merge branch 'release/0.7' into develop
Always direct for loop back IP.
Merge branch 'develop'