Merged with the latest 1.61/02 changes