Merge pull request #3867 from kumpera/issues