PR #6866

PR #6866 is not in the merge queue.