[SIMM-837] SIMM-837