Manually merging #1771