- merged 2.60.3 from PLD