Merge "APPC ConfigMap Labelling"