automerge: a91c5ca * commit 'a91c5ca78a0e9b24445126895a0070d399506849': Fix memory corruption in test