Final version of the 9.13 Pyke changes.