[SIMM-828] SIMM-828