[SIMM-829] SIMM-829