DAKATA-1551

DAKATA-1551