JMP updater fix
JMP updater fix
Merge branch 'develop' into refactoring