PR #6916

PR #6916 is not in the merge queue.