merge in master ExtensionsIndex