Merged in feature/unload-failed-state (pull request #74)

Feature/unload failed state

Approved-by: Richard Laager
Approved-by: Elliott Sales de Andrade