Preparing for #150 #151
Merge branch 'upstream/ODATA_4'