Merge "Fix data usage" into nyc-dev