Merge "Simplify role addtion helper functions"