Grep was suppressing non-zero exit

Needs some smarts around the pipefail logic
Merge branch 'hotfix/3.0.1'