Merge "catch USER_ALL in badging check" into oc-dev