Apply cschulte22's dynamic columns patch that was never merged to the official comma repository