Merge pull request #8130 from dyn888/master