Sync with core
Index method rename
Sync with core
merge