Merge pull request #7943 from ujjwalwahi/master