1.5.4 branch compatibility changes.