Merge branch 'tb/core-eol-fix' into maint