BZ1014071 - DataModelOracle: Performance issues when model is large
(cherry picked from commit 49d17932d45115e04d2be22b314fe490082859ab)