Merge "[SO] Make SO compatible with Kubernetes v1.17"