BRANCH 4.3: removed bad looking border