Merge pull request #6889 from remitamine/shahid