PR #7410

PR #7410 is not in the merge queue.