Merge "Fixes attaching instack interfaces to host"