User details incorrect when blind marking students

This is a variant( or another part) of the issue reported in MDL-46721. Although students are now getting the right participant number in email notifications the same is not true for teachers.

When feedback is given to a student for an assignment that has blind marking enabled, the email receipt sent out to students say something like " Participant xx has given feedback..."
where xx is the same number given to the student as part of the assignment. Hence it looks like the student has given themselves feedback which is not true.
To recreate the issue :
Create an assignment with blind marking turned on
As a student, add a file to the assignment
Student should get an email receipt saying they have submitted the assignment
As a teacher who cannot see the name of the student, mark the assignment and give the student feedback

• An email is sent out to the student saying that the "Participant number (which is their number) has given feedback...."

*I'd appreciate if this issue was not closed as duplicate without prior discussion in the comments section as I strongly feel this isn't a duplicate *.

Thanks
Hittesh