- merged 5.54 from PLD