fixes in integrationLib
Merge branch 'release/4.0.5'