If that's a function added to `org-mode-hook', it is not useful to add
"on major mode change".
> If there is no objection to this, I can fix this everywhere in maint,
> and then merge that into master.
Please make changes in "master" instead, and merge them into "next"
then.