Merge name_indexing branch, Scotts bugfixes into master