Merge "Activate integration tests"