overlay border corrected
Merge remote-tracking branch 'origin/drag-n-drop' into drag-n-drop
overlay border corrected
fixed column resize