[GERK-425] GERK-425