Fix for issue #20695 + new test document.