- merged 2.64.1 from PLD