PR #3131

PR #3131 is not in the merge queue.