PR #7198

PR #7198 is not in the merge queue.