Fixed extra data dir entries.
Merge branch 'test' into dev