develop

Merge border changes to master