PR #2306

PR #2306 is not in the merge queue.