Merge branch 'release/7.x-0.21' into develop
Merge branch 'hotfix/fix_cql_combine_with_null' into develop
tagging version 7.x-0.22
Merge branch 'release/7.x-0.22'