PR #6966

PR #6966 is not in the merge queue.