PR #6872

PR #6872 is not in the merge queue.