Merge "Fix for wrong class sequence k8s with oc4"