Custom borders #1461
phase 2