[Backport] Fixing update_roles when project point ? exists but is not null