Merge branch 'master' into develop
address, group administration
Merge branch 'release/1.1.0'