Merge "Fail build on unexpected status"