PR #7409

PR #7409 is not in the merge queue.