[SIMM-824] SIMM-824