PR #7172

PR #7172 is not in the merge queue.