PR #6838

PR #6838 is not in the merge queue.