Include DataMap size method.
Merge remote-tracking branch 'origin/drive_split' into disk_split