automerge: bb8d7ff * commit 'bb8d7ffeae187e8782a9494e252e335db537b2a1': Prevent memory corruption from use-after-free