Merge branch 'sandbox/knimitz/fix_set_role'