Merge branch 'ESSENTIAL_27'
Fix for column alignment (CONTRIB-4857)
Merge branch 'master' into ESSENTIAL_27