[Updater] better hero management
Merge remote-tracking branch 'origin/master'