Preliminary 1.6.x changes.