There wasn't that much needing to be changed, however, there is a crash. I think I'll have to leave that to you. Here's my diff: https://pasteall.org/7SRC I've asked you before in the BA thread, but maybe it may be worth submitting to Blender?