SI-7484 Add @SupressWarning(rawtypes/unchecked)