Merge branch '3694-data-policy-directory-stucture-3' into 'master'
Resolve "Data policy: directory structure version 3"
Closes #3694 (closed)
See merge request !5251 (merged)
(cherry picked from commit 3a83e1bf)
605dca22 data policy: directory structure version 3