PR #6955

PR #6955 is not in the merge queue.