[MDE-165] MDE-165