Merge "separate error status from progression status"