Avoid breaking out into a different shell
Merge commit '4da6ca4d6d39f98a8b8946bc926e999a9b5a12a5'