Update 1.18.6 patch (templatelinks fix), update 1.21.1 patch (rebased 1.18.6)