issue #19155: tweak to border behavior