Merge branch 'release/1.1'
Merge tag '1.1' into develop

separated from portal