fix buf with options[:incremental_col]
Merge branch 'lan_branch'