these patches have merged, use for $LKG only now