Merge "Sync sl-k8s-calico model with virtual-mcp11-k8s-calico"