PR #6833

PR #6833 is not in the merge queue.