Merge AutoIndex to release.
Merge fixes in Trunk.