PR #1710