Merge "Add support for dumping new badging" into klp-dev