Drop progress notifications on failure.
Fixed merge conflict