Merging PR #2598