PR #6986

PR #6986 is not in the merge queue.