FDK-2373

FDK-2373