Manually merging #1245 into 6.1