#287 Fixed the river name issue for the column strategy
Merge branch 'master-tmp'