Merge pull request #3945 from kumpera/fix-cross-domain-abort