Merge pull request #12255 from hosseinamin/master