Conflicts: test/integration/CMakeLists.txt Former-commit-id: 395f5210dc4f5ba36e48d0d965ee2c8cb857f0a7