VM pointer added as FunctionPtr last argument
Merge remote-tracking branch 'origin/master'