Merge "Update fail fast check logic" into main