Merge branch 'hotfix/2.4.1'
bugfix for integrationlib and code cleanup
bumpt to version 2.4.2
Merge branch 'hotfix/2.4.2' into develop