Fixed #150
Merge branch 'upstream/ODATA_4'