Merge pull request #12642 from mntechnique/fix-to-issue-#12512

Fix to issue #12512