All patches from PR #16542.
Scroll updates