Merge "Warped motion functions added" into nextgenv2