15 Commits (fix-drop-border)