Merge pull request #1764 from elupus/udffolder