Merge "Support empty role values in the RoleHolder atom" into main