Suggestion for flattening of the 'files' portion for the Cons3rt pillar.
Merge branch 'master' into flatten-cons3rt-files