[Yt-dev] HOP in-place patch