Fix add  column make ordering wrong
Merge branch 'develop'