Fix for WF-1583 Custom Column feature doesn't work with complex schema