Merge pull request #4274 from kumpera/cctor-abort