Merge "Add ncmp tag to application yaml"