Merge branch 'develop' into release/v1.1