Merge the latest Data branch into master jimmie->wangfeng

RT