bring up to date with changes pulled in from feature.foldercolumnsorting branch