Merge "Fix demo-k8"