Testing new same-origin workaround