Fix for tunnel-id set issues in intra DC communication scenario