CDB-2751 more missing gems