[SIMM-887] SIMM-887