Merge latest yet again. Now with even more native scrolling.