Merge "add a global control for badging" into oc-dev