Fix bug 1000487 - Add feature flag for badges
v1.0.77