locally add JVMSupport which is no longer in the client jar it seems
Merge branch 'master' into refactoring
Minor changes