- merged 1.8.25 from PLD