Merge branch 'upstreamedge' into fix/inverse-transform