PR #2957

PR #2957 is not in the merge queue.