[MIST-397] MIST-397