Merge "Fix badging meta-data value"