PR #6967

PR #6967 is not in the merge queue.