Removed obsolete SqlMaps
Merge branch 'release/1.20.0' into develop
Maven version bump
Bumped the version number up to 1.21
Merge branch 'release/1.21.0'