Merge branch 'release/ZmMxYj'
Merge tag '1.0.7' into develop

Added Address settings