Merge "Bug 4957 RoleContext updated with initialization"