[MIST-392] MIST-392