PR #7440

PR #7440 is not in the merge queue.