Merge branch 'hotfix/4.1.1' into develop
added r4.2
Merge branch 'release/v4.2'