Merge branch 'hotfix/opt-options' into develop
Merge branch 'master' into develop
fix on combining columns: only combine to columns that have not been combined away themselves