Updated the version in pom.xml
Merge branch 'hotfix/1.21.2'