PR #7321

PR #7321 is not in the merge queue.