Fix crossdomain decorator
Merge branch 'master' into fake-cloud-reset