PR #6870

PR #6870 is not in the merge queue.