PR #2391

PR #2391 is not in the merge queue.