merging #1684