Merge "Remove set -o errexit from script"