Merge remote-tracking branch 'remotes/origin/develop' into HEAD
adjust version information in integration test