PR #6843

PR #6843 is not in the merge queue.