PR #6927

PR #6927 is not in the merge queue.