Border overscan fixes (NY00123)
Merge origin/master