PR #2400

PR #2400 is not in the merge queue.