PR #2308

PR #2308 is not in the merge queue.