Merge pull request #3715 from kumpera/fix-44707