PR #7097

PR #7097 is not in the merge queue.