PR #7353

PR #7353 is not in the merge queue.