issue #19155: tweak to border behavior
Merge pull request #406 from jrogelstad/master

issue #19155: Merge to master.