Role issue fixed
Merge with local branch