Merge changes from topics "embms-0804-adjustments", "prepare-download-unhide"

* changes:
  Make changes in sample download service for adjustments
  Adjust sample app for API changes