PR #2399

PR #2399 is not in the merge queue.