These have a TODO comment in ODataResolver.cs
These have a TODO comment in ODataResolver.cs