Backport 1.8 gh 4502

Backport to 1.8: `BUG: Buffered stride was erroneously marked fixed (fixes #4485)`