PR #6961

PR #6961 is not in the merge queue.