Make load of index and table oids non-lazy.
Merge remote-tracking branch 'origin/development' into development