Add ColumnDisplayName overloading with Func<string>
Merge branch 'CDN'