PR #6883

PR #6883 is not in the merge queue.