[SIMM-889] SIMM-889