PR #6936

PR #6936 is not in the merge queue.