Merge Tavas latest changes into PPH fork