[SIMM-836] SIMM-836