Handle subfolders
Merge remote-tracking branch 'upstream/master' into subfolders
More validation rules depending on the field type
Merge branch 'subfolders'