Remove column bug fix
Merge origin/master