Removed hierarchy entry indexing from data objects
Merge remote-tracking branch 'upstream3/master'