Fix order issue
Merge branch 'master' into unstable
Update xray
Uncomment test for treansform