Merge pull request #12639 from aniesshsethh/issue_314