Merge pull request #2842 from totten/master-api-rollback-soft-errors