Merge "Fix set -e issue"