Merge pull request #7681 from neheb/luv