Merge "Guess the right encap/timeout for the VCN"