MDL-48142 core_badge: final polishing on badge award event