PR #6839

PR #6839 is not in the merge queue.