PR #6933

PR #6933 is not in the merge queue.