PR #7167

PR #7167 is not in the merge queue.