Manual merge. Closes #153