Merge pull request #13085 from colemanw/scroll