PR #6911

PR #6911 is not in the merge queue.