Merge "Change rule retrieval from CBS to ConfigMap"