PR #2435

PR #2435 is not in the merge queue.