Bugfix/multi column width

Closed Bitbucket Importer requested to merge bitbucket/declined-pr-329 into branch/2.6