Merge branch 'sp/dircachetest-data'