20260121 cleanup See merge request !2745
mentioned in issue #2363
mentioned in issue #2364
mentioned in issue #2366