automerge: b3650a9 * commit 'b3650a9661a7c1cac1c876f70a040d8a6f523657': Ensure crypto gets terminated on error.
b3650a9