PR #2623

PR #2623 is not in the merge queue.