Correct PU: add folder and family (refs #4151)
Merge pull request #948 from thingthing/3.2-I4152

Correct PU: add folder and family (fixes #4151)