PR #6931

PR #6931 is not in the merge queue.