PR #6907

PR #6907 is not in the merge queue.