PR #6949

PR #6949 is not in the merge queue.