Merge "dataservices: fix comilation issues"