PR #2531