PR #2536

PR #2536 is not in the merge queue.