Merge "Add workaround for tunnel connectivity" into 1.15