PR #6944

PR #6944 is not in the merge queue.