Merge tag 'v1.1' into develop

v1.1