[#ENGINE-28: warp was done after check, we need to do it before]
Merge branch 'master' of https://github.com/mxhero/engine