PR #7657

PR #7657 is not in the merge queue.