PR #2202

PR #2202 is not in the merge queue.