Merge "[Octavia] Switch to glancev2"