Merge pull request #4135 from lucize/greyfix