PR #7323

PR #7323 is not in the merge queue.