PR #6959

PR #6959 is not in the merge queue.