PR #7174

PR #7174 is not in the merge queue.