- merged 0.23.17 from PLD