Grouping breaks columns when I use Composite Columns

Try the latest source code from the master branch: