Adding a filter to change the base storage directory for private data (files for instance)
Merge branch 'release/5.0.1'