Start of 1.6.4 changes.