Merge pull request #13370 from vhwweng/bug_13369