Merge "CORD-2965 Fix crash when StatefulSet resources encountered"