[SIMM-842] SIMM-842