Update mako kernel branch