PR #6932

PR #6932 is not in the merge queue.