Manually upmerged