Merge "Companion changes for Alpine move"