Merge "disable elk in CI pipeline"