[SIMM-839] SIMM-839