Merge "Fix role processing in Patrole"