temp hack to ensure we set value to default role
Merge remote-tracking branch 'origin/master'