Simplified record loading in ILS drivers.
Merge branch 'master' into search-refactor