Merge remote-tracking branch 'ms/development' into failed-download-handling