[PYU-367] PYU-367