PR #2197

PR #2197 is not in the merge queue.