PR #2428

PR #2428 is not in the merge queue.