PR #6946

PR #6946 is not in the merge queue.