use full formatting as default
reverting last commit
Merge branch 'develop' into feature/ColumnFormat
renaming of columns