Modify so it works even if run in stop-on-error mode (bash -e)
Merge commit '606b827a34018f10a8858ac1a57d196a145226e6' (nonstop bash -e mode)