Merge "InvalidRoleException-junits"