backport from trunk (rev #10008)
always enforce the column delimiter