Merged borders back into dev.