Added feature flag for badge displaying.