PR #7152

PR #7152 is not in the merge queue.