Merge pull request #7045 from remitamine/ign