Fix for issue #20695

Fix for issue #20695 + test documents.