PR #7169

PR #7169 is not in the merge queue.