Wrong group name shown in creation and modification success message

We have a group hook that automatically adds a prefix to the group ID when it’s in a specific folder. The success message is showing the name I entered in the form instead of showing the name of the actual group created.

I narrowed it down to this modification :

SaveGroupAction.java
Line 342

FROM
request.setAttribute("message", new Message(
"groups.message.group-saved", (String) groupForm
.get("groupDisplayName")));

TO
request.setAttribute("message", new Message(
"groups.message.group-saved", group.getDisplayName()));