Merging PR #2598
Merging #2256