[SIMM-826] SIMM-826