PR #6926

PR #6926 is not in the merge queue.