CON-1303: Added default border color