Fixed #150
Merge branch 'upstream/ODATA_4'
Merge branch 'upstream/ODATA_4' (reverted from commit e2005d51de338987a348e5d2d52f7d682ae8ec09)