Branch 'uidmap' - xlators/features