automerge: 1e5dd46
* commit '1e5dd46133bd47445ba0657692fb86492acad705':
Prevent memory corruption from use-after-free
automerge: 1e5dd46
* commit '1e5dd46133bd47445ba0657692fb86492acad705':
Prevent memory corruption from use-after-free