[SIMM-838] SIMM-838