[SIMM-854] SIMM-854