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