Merge branch 'release/1.1.21' into develop
Composer changes
Bump
Merge branch 'release/1.1.22'