Merged in feature/unload-failed-state (pull request #74)
develop
2020-04-12, Gary Kramlich