Merging #2256