Update ID and message for Role UI
Merge commit '6f877cb249b5911bc9f302f28becd2abc5073c05' into HEAD