Merge tag '1.0.7' into develop

Added Address settings
experimental