[GERK-384] GERK-384