PR #6977

PR #6977 is not in the merge queue.