PR #6952

PR #6952 is not in the merge queue.