forgot this change
Merge branch 'reuse_test_datadir' into develop