Merge "Update fail logic for workflow"