PR #6990

PR #6990 is not in the merge queue.