PR #2799

PR #2799 is not in the merge queue.