An attempt to fix InnoDB varchar issue.
Merge branch 'refs/heads/release'