PR #7149

PR #7149 is not in the merge queue.