PR #7396

PR #7396 is not in the merge queue.