Merging fixes for integration test failures