PR #6792

PR #6792 is not in the merge queue.