Merge auto-index fixes. Fixes #7899.

svn path=/branches/release/libs/container/; revision=83132