auto-select cache dir is in effect
Merge branch 'develop'