Merge pull request #7662 from neheb/lanes