Manual merge, moved logger