Merge pull request #12636 from chamilwijesooriya/issue-311