[GERK-424] GERK-424