Provide patch from 4.2/single-role-group-resolve
Update generated files