PR #2195

PR #2195 is not in the merge queue.