Added support for empty borders. References #2525