Work to finish fixing add badge

Issues exist because of regression in CreateBadge.
Merge remote-tracking branch 'origin/Add-Badge-Issues'