Merged clean-up-only changes made in the ChangingIPDHack branch. Those correspond to the following revision numbers: 785291 785632 787733 787769 788371 793645