Dir store redux

Same as !317 (closed), with only first and last commits.

Merge request reports

Loading