PR #7305

PR #7305 is not in the merge queue.