PR #6922

PR #6922 is not in the merge queue.