[INTERNAL] v2.ODataModel improvements

Change-Id: I17dda30605520538eaeaf6f274fe4c03e96201ba
Merge "[INTERNAL] v2.ODataModel improvements"