Sync to 6.5.
Version bump.