Don't alter list of columns to select
Merge branch '4.1'
Updated test
Merge branch '4.1'