Merged PR #1810