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