Handle aggregate columns and don't break on new file handles
Merge remote-tracking branch 'upstream/develop' into PLFM-2987
spurious test fix
Merge pull request #1557 from marcel-blonk/PLFM-2987

Handle aggregate columns and don't break on new file handles