Removing bad check for failure
Merge branch 'release-2.1'