[MIST-393] MIST-393