Border size correction
Merge remote-tracking branch 'origin/abdalla'
Merged with Abdalla