PR #6790

PR #6790 is not in the merge queue.