New test document for issue #20695.
Fix for issue #20695 + new test document.
Merge pull request #2 from gadlim/master

Fix for issue #20695