Updated regexp for data_dir change.
Merge branch 'test' into dev