PR #6951

PR #6951 is not in the merge queue.