Merge "applying new badge API" into devel_3.0_main