Fix for column alignment (CONTRIB-4857)
Merge remote-tracking branch 'upstream/master'