nb
Merge from seagate + reindex
Merge from seagate