Merge change 2300 into donut

* changes:
  SDK Updater: some refactoring and some new features.