Changed data_dir to platoform data dir.
Merge branch 'test' into dev