merge development-custom into failed-download-handling