Merge pull request #1508 from slluis/fix-20966