I’m afraid not. The fix is in the xwiki-platform-legacy-oldcore jar. I don’t think you can take the 9.6-rc-1 version of this jar because it may contain other changes that are not compatible with your version. The only option is to do a git cherry-pick and to build the jar yourself, but it’s not a quick solution.
No worries. I’ve found a temporary way around this by setting the “action on create” field in the template providers to “save and edit” rather than just “edit”. Seems to have done the job!