[PYU-395] PYU-395