PR #6797

PR #6797 is not in the merge queue.