Merge "ELK version bump"