[TASK] ADWD-1224 only load borders once