[MIST-395] MIST-395