Fixes for the updater tool
Merge branch 'develop'

* develop:
  Fixes for the updater tool