Updated version code and name
Small fix and configuration change
Release 4.2.1
Merge branch 'release/4.2.1' into development