PR #7525

PR #7525 is not in the merge queue.