Merge pull request #13395 from vhwweng/issue_13324