Merge "Kubernetes (k8s) support"