[SIMM-858] SIMM-858