Merge "API council requested tweaks to DataUnit." into pi-dev