Merging pi-yt isolated fix into our branch